Auto merge of #1964 - steveklabnik:doc_fix, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 3 Sep 2015 16:28:44 +0000 (16:28 +0000)
committerbors <bors@rust-lang.org>
Thu, 3 Sep 2015 16:28:44 +0000 (16:28 +0000)
commit7ea82651fd02a74223789c7a1e105f43c5bd3e64
tree08f4040662890169da4319ce32b03e901bf670a4
parent4bc0456f15dedbb5951092ebd8a4b2defc1193a4
parentfae3b91ec7b1ebb9c5770f4d7a35c7a23b4ef4ba
Auto merge of #1964 - steveklabnik:doc_fix, r=alexcrichton

This has changed, apparently.